gtkwindow: Force CSD on Wayland

We rely on CSD here on the Wayland platform and giving the opportunity
to turn it off doesn't make too much sense.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index f8e71fcc46a45d4eabad7066f767d0739c97a633..2fef625130e94a5333ac09d628b98545fa57fbaf 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5575,14 +5575,13 @@ gtk_window_should_use_csd (GtkWindow *window)
     return TRUE;
 #endif
 
-  csd_env = g_getenv ("GTK_CSD");
-
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))) &&
-      g_strcmp0 (csd_env, "0") != 0)
+  if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
     return TRUE;
 #endif
 
+  csd_env = g_getenv ("GTK_CSD");
+
   return (g_strcmp0 (csd_env, "1") == 0);
 }